Minor fix to handling of misc->[x/y]pad

Tue Jan 12 15:41:20 1999  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtklabel.c (gtk_label_expose): Minor fix
	to handling of misc->[x/y]pad

diff --git a/ChangeLog b/ChangeLog
index e2132b8d39f8850529d7ac604c7550b9ff0c5bd0..f7a6ea3bffcd495e5ad9d2b3d37865754c846872 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Tue Jan 12 15:41:20 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_expose): Minor fix
+       to handling of misc->[x/y]pad
+
+Tue Jan 12 14:31:43 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkstyle.[ch] (gtk_style_apply_default_pixmap): 
+       Add back as wrapper function to restore source/binary 
+       compatibility. grrrr.
+
 Tue Jan 12 13:47:07 1999  Tim Janik  <timj@gtk.org>
 
        * reworked the redrawing heuristics somewhat, this fixed a bunch of

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index e2132b8d39f8850529d7ac604c7550b9ff0c5bd0..f7a6ea3bffcd495e5ad9d2b3d37865754c846872 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,14 @@
+Tue Jan 12 15:41:20 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_expose): Minor fix
+       to handling of misc->[x/y]pad
+
+Tue Jan 12 14:31:43 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkstyle.[ch] (gtk_style_apply_default_pixmap): 
+       Add back as wrapper function to restore source/binary 
+       compatibility. grrrr.
+
 Tue Jan 12 13:47:07 1999  Tim Janik  <timj@gtk.org>
 
        * reworked the redrawing heuristics somewhat, this fixed a bunch of

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e2132b8d39f8850529d7ac604c7550b9ff0c5bd0..f7a6ea3bffcd495e5ad9d2b3d37865754c846872 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+Tue Jan 12 15:41:20 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_expose): Minor fix
+       to handling of misc->[x/y]pad
+
+Tue Jan 12 14:31:43 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkstyle.[ch] (gtk_style_apply_default_pixmap): 
+       Add back as wrapper function to restore source/binary 
+       compatibility. grrrr.
+
 Tue Jan 12 13:47:07 1999  Tim Janik  <timj@gtk.org>
 
        * reworked the redrawing heuristics somewhat, this fixed a bunch of

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e2132b8d39f8850529d7ac604c7550b9ff0c5bd0..f7a6ea3bffcd495e5ad9d2b3d37865754c846872 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,14 @@
+Tue Jan 12 15:41:20 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_expose): Minor fix
+       to handling of misc->[x/y]pad
+
+Tue Jan 12 14:31:43 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkstyle.[ch] (gtk_style_apply_default_pixmap): 
+       Add back as wrapper function to restore source/binary 
+       compatibility. grrrr.
+
 Tue Jan 12 13:47:07 1999  Tim Janik  <timj@gtk.org>
 
        * reworked the redrawing heuristics somewhat, this fixed a bunch of

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e2132b8d39f8850529d7ac604c7550b9ff0c5bd0..f7a6ea3bffcd495e5ad9d2b3d37865754c846872 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+Tue Jan 12 15:41:20 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_expose): Minor fix
+       to handling of misc->[x/y]pad
+
+Tue Jan 12 14:31:43 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkstyle.[ch] (gtk_style_apply_default_pixmap): 
+       Add back as wrapper function to restore source/binary 
+       compatibility. grrrr.
+
 Tue Jan 12 13:47:07 1999  Tim Janik  <timj@gtk.org>
 
        * reworked the redrawing heuristics somewhat, this fixed a bunch of

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e2132b8d39f8850529d7ac604c7550b9ff0c5bd0..f7a6ea3bffcd495e5ad9d2b3d37865754c846872 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+Tue Jan 12 15:41:20 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_expose): Minor fix
+       to handling of misc->[x/y]pad
+
+Tue Jan 12 14:31:43 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkstyle.[ch] (gtk_style_apply_default_pixmap): 
+       Add back as wrapper function to restore source/binary 
+       compatibility. grrrr.
+
 Tue Jan 12 13:47:07 1999  Tim Janik  <timj@gtk.org>
 
        * reworked the redrawing heuristics somewhat, this fixed a bunch of

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e2132b8d39f8850529d7ac604c7550b9ff0c5bd0..f7a6ea3bffcd495e5ad9d2b3d37865754c846872 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+Tue Jan 12 15:41:20 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_expose): Minor fix
+       to handling of misc->[x/y]pad
+
+Tue Jan 12 14:31:43 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkstyle.[ch] (gtk_style_apply_default_pixmap): 
+       Add back as wrapper function to restore source/binary 
+       compatibility. grrrr.
+
 Tue Jan 12 13:47:07 1999  Tim Janik  <timj@gtk.org>
 
        * reworked the redrawing heuristics somewhat, this fixed a bunch of

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 84ac17b30f786171fffad48edc6682c6d728f063..8015fecf415f7c88520477eec51a64e7100f30ad 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -921,12 +921,12 @@ gtk_label_expose (GtkWidget      *widget,
       gdk_gc_set_clip_rectangle (widget->style->fg_gc[widget->state], &event->area);
       
       x = widget->allocation.x + misc->xpad +
-       (widget->allocation.width - label->max_width) 
+       (widget->allocation.width - label->max_width - 2 * misc->xpad) 
        * misc->xalign + 0.5;
       
       y = (widget->allocation.y
           + (widget->allocation.height
-             - widget->requisition.height) * misc->yalign
+             - widget->requisition.height - 2 * misc->ypad) * misc->yalign
           + misc->ypad + 0.5);
       for (word = label->words; word; word = word->next)
        {